From f04f94370844cd63f3490f85a3d261c539528aaa Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 16 May 2011 19:42:27 +0200 Subject: [PATCH] styleproperties: Mark "color" and "font" as inherit Keeping it identical to CSS 2.1 again --- gtk/gtkstyleproperties.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index 28c2d9a794..dc615d24a8 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -98,26 +98,30 @@ static void gtk_style_properties_class_init (GtkStylePropertiesClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); + GParamSpec *pspec; object_class->finalize = gtk_style_properties_finalize; /* Initialize default property set */ - gtk_style_properties_register_property (NULL, - g_param_spec_boxed ("color", - "Foreground color", - "Foreground color", - GDK_TYPE_RGBA, 0)); + pspec = g_param_spec_boxed ("color", + "Foreground color", + "Foreground color", + GDK_TYPE_RGBA, 0); + gtk_style_param_set_inherit (pspec, TRUE); + gtk_style_properties_register_property (NULL, pspec); + gtk_style_properties_register_property (NULL, g_param_spec_boxed ("background-color", "Background color", "Background color", GDK_TYPE_RGBA, 0)); - gtk_style_properties_register_property (NULL, - g_param_spec_boxed ("font", - "Font Description", - "Font Description", - PANGO_TYPE_FONT_DESCRIPTION, 0)); + pspec = g_param_spec_boxed ("font", + "Font Description", + "Font Description", + PANGO_TYPE_FONT_DESCRIPTION, 0); + gtk_style_param_set_inherit (pspec, TRUE); + gtk_style_properties_register_property (NULL, pspec); gtk_style_properties_register_property (NULL, g_param_spec_boxed ("margin", -- 2.30.2